185
191
msgid "No conflicts in working tree."
194
#: conflicts.py:115 conflicts.py:116
189
195
msgid "path conflict"
198
#: conflicts.py:117 conflicts.py:118
193
199
msgid "contents conflict"
202
#: conflicts.py:119 conflicts.py:120
197
203
msgid "text conflict"
206
#: conflicts.py:121 conflicts.py:122
201
207
msgid "duplicate id"
210
#: conflicts.py:123 conflicts.py:124
205
211
msgid "duplicate"
214
#: conflicts.py:125 conflicts.py:126
209
215
msgid "parent loop"
218
#: conflicts.py:127 conflicts.py:128
213
219
msgid "unversioned parent"
222
#: conflicts.py:129 conflicts.py:130
217
223
msgid "missing parent"
226
#: conflicts.py:131 conflicts.py:132
221
227
msgid "deleting parent"
230
#: conflicts.py:133 conflicts.py:134
225
231
msgid "unknown type of conflict"
228
234
#: conflicts.py:162 __init__.py:614 add.py:67 menu.py:178 menu.py:191
229
235
#: menu.py:218 menu.py:254 move.py:79 remove.py:67 remove.py:129 rename.py:70
236
#: conflicts.py:163 olive/__init__.py:687 olive/add.py:67 olive/menu.py:177
237
#: olive/menu.py:190 olive/menu.py:217 olive/menu.py:253 olive/move.py:79
238
#: olive/remove.py:67 olive/remove.py:129 olive/rename.py:70
230
239
msgid "No file was selected"
233
#: conflicts.py:163 __init__.py:615 menu.py:192
242
#: conflicts.py:163 __init__.py:615 menu.py:192 conflicts.py:164
243
#: olive/__init__.py:688 olive/menu.py:191
234
244
msgid "Please select a file from the list."
247
#: conflicts.py:173 conflicts.py:174
238
248
msgid "Call to external utility failed"
251
#: conflicts.py:175 conflicts.py:176
242
252
msgid "Cannot resolve conflict"
255
#: conflicts.py:176 conflicts.py:177
247
257
"Only conflicts on the text of files can be resolved with Olive at the "
248
258
"moment. Content conflicts, on the structure of the tree, need to be resolved "
498
#: status.py:78 status.py:82
502
#: status.py:84 status.py:88
506
#: status.py:90 status.py:94
510
#: status.py:97 status.py:101
514
#: status.py:105 status.py:109
518
#: status.py:110 status.py:114
509
519
msgid "No changes."
522
#: tags.py:67 tags.py:65
526
#: tags.py:111 tags.py:109
530
#: tags.py:116 tags.py:114
521
531
msgid "Revision ID"
534
#: tags.py:151 tags.py:149
525
535
msgid "Tags are not supported by this branch format. Please upgrade."
538
#: tags.py:157 tags.py:155
529
539
msgid "No tagged revisions in the branch."
542
#: tags.py:232 tags.py:230
533
543
msgid "_Remove tag"
546
#: tags.py:242 tags.py:240
537
547
msgid "<b><big>Remove tag?</big></b>"
550
#: tags.py:244 tags.py:242
542
552
msgid "Are you sure you want to remove the tag: <b>%s</b>?"
555
#: tags.py:289 tags.py:287
559
#: tags.py:291 tags.py:289
550
560
msgid "Tag Name:"
563
#: tags.py:292 tags.py:290
554
564
msgid "Revision ID:"
567
#: tags.py:323 tags.py:321
558
568
msgid "No tag name specified"
571
#: tags.py:324 tags.py:322
562
572
msgid "You have to specify the tag's desired name."
575
#: __init__.py:512 olive/__init__.py:539
566
576
msgid "There are local changes in the branch"
579
#: __init__.py:513 olive/__init__.py:540
570
580
msgid "Please commit or revert the changes before merging."
573
#: __init__.py:525 __init__.py:550
583
#: __init__.py:525 __init__.py:550 olive/__init__.py:555 olive/__init__.py:612
574
584
msgid "Parent location is unknown"
587
#: __init__.py:526 olive/__init__.py:556
578
588
msgid "Cannot determine missing revisions if no parent location is known."
591
#: __init__.py:537 olive/__init__.py:599
582
592
msgid "There are missing revisions"
587
597
msgid "%d revision(s) missing."
600
#: __init__.py:540 olive/__init__.py:602
591
601
msgid "Local branch up to date"
604
#: __init__.py:541 olive/__init__.py:603
595
605
msgid "There are no missing revisions."
608
#: __init__.py:551 olive/__init__.py:613
599
609
msgid "Pulling is not possible until there is a parent location."
612
#: __init__.py:561 olive/__init__.py:623
603
613
msgid "Pull successful"
616
#: __init__.py:561 olive/__init__.py:623
608
618
msgid "%d revision(s) pulled."
611
#: __init__.py:575 menu.py:275
621
#: __init__.py:575 menu.py:275 olive/__init__.py:648 olive/menu.py:274
612
622
msgid "Conflicts detected"
615
#: __init__.py:576 menu.py:276
625
#: __init__.py:576 menu.py:276 olive/__init__.py:649 olive/menu.py:275
616
626
msgid "Please have a look at the working tree before continuing."
619
#: __init__.py:578 menu.py:278
629
#: __init__.py:578 menu.py:278 olive/__init__.py:651 olive/menu.py:277
620
630
msgid "Revert successful"
623
#: __init__.py:579 menu.py:279
633
#: __init__.py:579 menu.py:279 olive/__init__.py:652 olive/menu.py:278
624
634
msgid "All files reverted to last revision."
627
#: __init__.py:835 __init__.py:1117
637
#: __init__.py:835 __init__.py:1117 olive/__init__.py:942
638
#: olive/__init__.py:1240
628
639
msgid "Bookmarks"
631
#: __init__.py:842 menu.py:99
642
#: __init__.py:842 menu.py:99 olive/__init__.py:949 olive/menu.py:98
635
#: __init__.py:944 __init__.py:1231
646
#: __init__.py:944 __init__.py:1231 olive/__init__.py:1057
647
#: olive/__init__.py:1362
636
648
msgid "unchanged"
639
#: __init__.py:946 __init__.py:1233
651
#: __init__.py:946 __init__.py:1233 olive/__init__.py:1059
652
#: olive/__init__.py:1364
643
#: __init__.py:948 __init__.py:1235
656
#: __init__.py:948 __init__.py:1235 olive/__init__.py:1061
657
#: olive/__init__.py:1368
661
#: __init__.py:964 olive/__init__.py:1083
665
#: __init__.py:965 olive/__init__.py:1084
669
#: __init__.py:966 olive/__init__.py:1085
673
#: __init__.py:967 olive/__init__.py:1086
660
674
msgid "Last modified"
663
677
#: add.py:68 menu.py:179 menu.py:219 menu.py:255 remove.py:68 remove.py:130
678
#: olive/add.py:68 olive/menu.py:178 olive/menu.py:218 olive/menu.py:254
679
#: olive/remove.py:68 olive/remove.py:130
665
681
"Please select a file from the list,\n"
666
682
"or choose the other option."
685
#: bookmark.py:46 olive/bookmark.py:46
689
#: bookmark.py:81 olive/bookmark.py:81
674
690
msgid "No title given"
693
#: bookmark.py:82 olive/bookmark.py:82
678
694
msgid "Please specify a title to continue."
697
#: guifiles.py:45 olive/guifiles.py:47
682
698
msgid "Glade file cannot be found."
701
#: guifiles.py:55 olive/guifiles.py:57
686
702
msgid "UI description file cannot be found."
705
#: menu.py:63 olive/menu.py:62
709
#: menu.py:64 olive/menu.py:63
694
710
msgid "Add the selected file"
697
#: menu.py:67 menu.py:107
713
#: menu.py:67 menu.py:107 olive/menu.py:66 olive/menu.py:106
717
#: menu.py:68 olive/menu.py:67
702
718
msgid "Remove the selected file"
721
#: menu.py:71 olive/menu.py:70
706
722
msgid "Remove and delete"
725
#: menu.py:72 olive/menu.py:71
710
726
msgid "Remove the selected file/dir and delete from disk"
729
#: menu.py:75 olive/menu.py:74
733
#: menu.py:76 olive/menu.py:75
718
734
msgid "Rename the selected file"
737
#: menu.py:79 olive/menu.py:78
741
#: menu.py:80 olive/menu.py:79
726
742
msgid "Open the selected file"
745
#: menu.py:83 olive/menu.py:82
749
#: menu.py:84 olive/menu.py:83
734
750
msgid "Revert the changes"
753
#: menu.py:88 olive/menu.py:87
738
754
msgid "Commit the changes"
757
#: menu.py:91 olive/menu.py:90
761
#: menu.py:92 olive/menu.py:91
746
762
msgid "Annotate the selected file"
765
#: menu.py:95 olive/menu.py:94
769
#: menu.py:96 olive/menu.py:95
754
770
msgid "Show the diff of the file"
773
#: menu.py:100 olive/menu.py:99
758
774
msgid "Bookmark current location"
777
#: menu.py:103 olive/menu.py:102
781
#: menu.py:104 olive/menu.py:103
766
782
msgid "Edit the selected bookmark"
785
#: menu.py:108 olive/menu.py:107
770
786
msgid "Remove the selected bookmark"
789
#: menu.py:111 olive/menu.py:110
774
790
msgid "Open Folder"
793
#: menu.py:112 olive/menu.py:111
778
794
msgid "Open bookmark folder in Nautilus"
797
#: menu.py:115 olive/menu.py:114
782
798
msgid "Selected..."
801
#: menu.py:116 olive/menu.py:115
786
802
msgid "Show the differences of the selected file"
805
#: menu.py:119 olive/menu.py:118
809
#: menu.py:120 olive/menu.py:119
794
810
msgid "Show the differences of all files"
813
#: menu.py:123 olive/menu.py:122
798
814
msgid "View contents"
817
#: menu.py:124 olive/menu.py:123
802
818
msgid "View the contents of the file in a builtin viewer"
821
#: menu.py:127 olive/menu.py:126
806
822
msgid "Show differences"
825
#: menu.py:128 olive/menu.py:127
810
826
msgid "Show the differences between two revisions of the file"
829
#: menu.py:131 olive/menu.py:130
814
830
msgid "Revert to this revision"
833
#: menu.py:132 olive/menu.py:131
818
834
msgid "Revert the selected file to the selected revision"
837
#: menu.py:228 olive/menu.py:227
822
838
msgid "Delete directory with all directories below ?"
841
#: menu.py:315 olive/__init__.py:707 olive/menu.py:318
826
842
msgid "Bookmark successfully added"
845
#: menu.py:316 olive/__init__.py:708 olive/menu.py:319
831
847
"The current directory was bookmarked. You can reach\n"
832
848
"it by selecting it from the left panel."
851
#: menu.py:319 olive/__init__.py:711 olive/menu.py:322
836
852
msgid "Location already bookmarked"
855
#: menu.py:320 olive/__init__.py:712 olive/menu.py:323
841
857
"The current directory is already bookmarked.\n"
842
858
"See the left panel for reference."
861
#: mkdir.py:67 olive/mkdir.py:67
846
862
msgid "No directory name given"
865
#: mkdir.py:68 olive/mkdir.py:68
850
866
msgid "Please specify a desired name for the new directory."
853
#: mkdir.py:79 mkdir.py:89
869
#: mkdir.py:79 mkdir.py:89 olive/mkdir.py:79 olive/mkdir.py:89
854
870
msgid "Directory already exists"
857
#: mkdir.py:80 mkdir.py:90
873
#: mkdir.py:80 mkdir.py:90 olive/mkdir.py:80 olive/mkdir.py:90
858
874
msgid "Please specify another name to continue."
861
#: move.py:80 rename.py:71
877
#: move.py:80 rename.py:71 olive/move.py:80 olive/rename.py:71
862
878
msgid "Please select a file from the list to proceed."
865
#: move.py:89 rename.py:87
881
#: move.py:89 rename.py:87 olive/move.py:89 olive/rename.py:87
866
882
msgid "Not the same branch"
869
#: move.py:90 rename.py:88
885
#: move.py:90 rename.py:88 olive/move.py:90 olive/rename.py:88
870
886
msgid "The destination is not in the same branch."
873
#: remove.py:79 remove.py:139
889
#: remove.py:79 remove.py:139 olive/remove.py:79 olive/remove.py:139
874
890
msgid "No matching files"
877
#: remove.py:80 remove.py:140
893
#: remove.py:80 remove.py:140 olive/remove.py:80 olive/remove.py:140
878
894
msgid "No added files were found in the working tree."
881
#: remove.py:105 olive.glade:825
897
#: remove.py:105 olive.glade:825 olive.glade:878 olive/remove.py:105
882
898
msgid "Which file(s) do you want to remove?"
885
#: remove.py:106 olive.glade:717 olive.glade:837
901
#: remove.py:106 olive.glade:717 olive.glade:837 olive.glade:766
902
#: olive.glade:890 olive/remove.py:106
886
903
msgid "Selected only"
889
#: remove.py:107 olive.glade:851
906
#: remove.py:107 olive.glade:851 olive.glade:905 olive/remove.py:107
890
907
msgid "All files with status 'added'"
893
#: remove.py:108 olive.glade:905
910
#: remove.py:108 olive.glade:905 olive.glade:962 olive/remove.py:108
914
#: rename.py:75 olive/rename.py:75
898
915
msgid "Filename not given"
918
#: rename.py:76 olive/rename.py:76
902
919
msgid "Please specify a new name for the file."
918
935
msgid "Remove file(s)..."
938
#: olive.glade:63 olive.glade:71
922
939
msgid "Make _directory..."
942
#: olive.glade:76 olive.glade:84
926
943
msgid "_Rename..."
946
#: olive.glade:84 olive.glade:92
950
#: olive.glade:92 olive.glade:100
934
951
msgid "_Annotate..."
954
#: olive.glade:118 olive.glade:126
958
#: olive.glade:126 olive.glade:134
942
959
msgid "Show _hidden files"
962
#: olive.glade:139 olive.glade:155
966
#: olive.glade:158 olive.glade:174
950
967
msgid "_Initialize..."
970
#: olive.glade:166 olive.glade:182
974
#: olive.glade:174 olive.glade:190
958
975
msgid "C_heckout..."
978
#: olive.glade:187 olive.glade:203
982
#: olive.glade:201 olive.glade:217
986
#: olive.glade:220 olive.glade:245
970
987
msgid "_Revert all changes"
990
#: olive.glade:228 olive.glade:253
974
991
msgid "_Merge..."
994
#: olive.glade:236 olive.glade:261
978
995
msgid "_Commit..."
998
#: olive.glade:255 olive.glade:280
1002
#: olive.glade:263 olive.glade:288
986
1003
msgid "S_tatus..."
1006
#: olive.glade:271 olive.glade:296
990
1007
msgid "Missing _revisions"
1010
#: olive.glade:279 olive.glade:304
994
1011
msgid "Con_flicts..."
1014
#: olive.glade:291 olive.glade:316
998
1015
msgid "_Statistics"
1018
#: olive.glade:298 olive.glade:323
1002
1019
msgid "_Differences..."
1022
#: olive.glade:312 olive.glade:337
1006
1023
msgid "_Log..."
1026
#: olive.glade:326 olive.glade:351
1010
1027
msgid "_Information..."
1030
#: olive.glade:338 olive.glade:363
1034
#: olive.glade:548 olive.glade:590
1018
1035
msgid "gtk-jump-to"
1038
#: olive.glade:575 olive.glade:618
1022
1039
msgid "H_istory Mode"
1042
#: olive.glade:673 olive.glade:722
1026
1043
msgid "Copyright (C) 2006 Szilveszter Farkas (Phanatic)"
1046
#: olive.glade:675 olive.glade:724
1030
1047
msgid "https://launchpad.net/products/olive"
1050
#: olive.glade:677 olive.glade:726
1034
1051
msgid "translator-credits"
1054
#: olive.glade:694 olive.glade:743
1038
1055
msgid "Olive - Add file(s)"
1058
#: olive.glade:705 olive.glade:754
1042
1059
msgid "Which file(s) do you want to add?"
1062
#: olive.glade:731 olive.glade:781
1046
1063
msgid "All unknowns recursively"
1066
#: olive.glade:785 olive.glade:838
1070
#: olive.glade:814 olive.glade:867
1054
1071
msgid "Olive - Remove file(s)"
1074
#: olive.glade:934 olive.glade:991
1058
1075
msgid "Olive - Make directory"
1078
#: olive.glade:957 olive.glade:1014
1062
1079
msgid "_Versioned directory"
1082
#: olive.glade:1011 olive.glade:1071
1066
1083
msgid "_Make directory"
1086
#: olive.glade:1041 olive.glade:1101
1070
1087
msgid "Olive - Move"
1090
#: olive.glade:1055 olive.glade:1115
1074
1091
msgid "Move to"
1094
#: olive.glade:1066 olive.glade:1126
1078
1095
msgid "Select a directory"
1098
#: olive.glade:1120 olive.glade:1182
1102
#: olive.glade:1148 olive.glade:1210
1086
1103
msgid "Olive - Rename"
1106
#: olive.glade:1162 olive.glade:1224
1090
1107
msgid "Rename to"
1110
#: olive.glade:1227 olive.glade:1291
1094
1111
msgid "_Rename"
1114
#: olive.glade:1255 olive.glade:1319
1098
1115
msgid "Olive - Information"
1106
1123
#: olive.glade:1903 olive.glade:1916 olive.glade:1929 olive.glade:1942
1107
1124
#: olive.glade:1955 olive.glade:1968 olive.glade:2109 olive.glade:2120
1108
1125
#: olive.glade:2133 olive.glade:2146 olive.glade:2159 olive.glade:2264
1126
#: olive.glade:2275 olive.glade:1343 olive.glade:1356 olive.glade:1369
1127
#: olive.glade:1382 olive.glade:1395 olive.glade:1408 olive.glade:1421
1128
#: olive.glade:1548 olive.glade:1559 olive.glade:1628 olive.glade:1639
1129
#: olive.glade:1652 olive.glade:1665 olive.glade:1758 olive.glade:1769
1130
#: olive.glade:1782 olive.glade:1863 olive.glade:1874 olive.glade:1943
1131
#: olive.glade:1954 olive.glade:1967 olive.glade:1980 olive.glade:1993
1132
#: olive.glade:2006 olive.glade:2019 olive.glade:2032 olive.glade:2173
1133
#: olive.glade:2184 olive.glade:2197 olive.glade:2210 olive.glade:2223
1134
#: olive.glade:2328 olive.glade:2339
1138
#: olive.glade:1368 olive.glade:1432
1114
1139
msgid "Checkout root: "
1142
#: olive.glade:1380 olive.glade:1444
1118
1143
msgid "Branch root: "
1146
#: olive.glade:1392 olive.glade:1456
1122
1147
msgid "Repository checkout: "
1150
#: olive.glade:1404 olive.glade:1468
1126
1151
msgid "Checkout of branch: "
1154
#: olive.glade:1416 olive.glade:1480
1130
1155
msgid "Repository branch: "
1158
#: olive.glade:1428 olive.glade:1492
1134
1159
msgid "Shared repository: "
1162
#: olive.glade:1440 olive.glade:1504
1138
1163
msgid "Light checkout root: "
1166
#: olive.glade:1454 olive.glade:1518
1142
1167
msgid "<b>Location:</b>"
1170
#: olive.glade:1508 olive.glade:1572
1146
1171
msgid "Publish to branch: "
1174
#: olive.glade:1520 olive.glade:1584
1150
1175
msgid "Parent branch: "
1178
#: olive.glade:1534 olive.glade:1598
1154
1179
msgid "<b>Related branches:</b>"
1182
#: olive.glade:1614 olive.glade:1678
1158
1183
msgid "Repository format: "
1186
#: olive.glade:1626 olive.glade:1690
1162
1187
msgid "Branch format: "
1190
#: olive.glade:1638 olive.glade:1702
1166
1191
msgid "Working tree format: "
1194
#: olive.glade:1650 olive.glade:1714
1170
1195
msgid "Control format: "
1198
#: olive.glade:1664 olive.glade:1728
1174
1199
msgid "<b>Format:</b>"
1202
#: olive.glade:1731 olive.glade:1795
1178
1203
msgid "Repository lock status: "
1206
#: olive.glade:1743 olive.glade:1807
1182
1207
msgid "Branch lock status: "
1210
#: olive.glade:1755 olive.glade:1819
1186
1211
msgid "Working tree lock status: "
1214
#: olive.glade:1769 olive.glade:1833
1190
1215
msgid "<b>Lock status:</b>"
1218
#: olive.glade:1823 olive.glade:1887
1194
1219
msgid "Missing revisions in branch: "
1222
#: olive.glade:1835 olive.glade:1899
1198
1223
msgid "Missing revisions in working tree: "
1226
#: olive.glade:1849 olive.glade:1913
1202
1227
msgid "<b>Missing revisions:</b>"
1230
#: olive.glade:1981 olive.glade:2045
1206
1231
msgid "Versioned subdirectories: "
1234
#: olive.glade:1993 olive.glade:2057
1210
1235
msgid "Ignored files: "
1238
#: olive.glade:2005 olive.glade:2069
1214
1239
msgid "Unknown files: "
1242
#: olive.glade:2017 olive.glade:2081
1218
1243
msgid "Renamed files: "
1246
#: olive.glade:2029 olive.glade:2093
1222
1247
msgid "Removed files: "
1250
#: olive.glade:2041 olive.glade:2105
1226
1251
msgid "Added files: "
1254
#: olive.glade:2053 olive.glade:2117
1230
1255
msgid "Modified files: "
1258
#: olive.glade:2065 olive.glade:2129
1234
1259
msgid "Unchanged files: "
1262
#: olive.glade:2079 olive.glade:2143
1238
1263
msgid "<b>In the working tree:</b>"
1266
#: olive.glade:2172 olive.glade:2236
1242
1267
msgid "Time of last revision: "
1270
#: olive.glade:2184 olive.glade:2248
1246
1271
msgid "Time of first revision: "
1274
#: olive.glade:2196 olive.glade:2260
1250
1275
msgid "Age of branch in days: "
1278
#: olive.glade:2208 olive.glade:2272
1254
1279
msgid "Number of commiters: "
1282
#: olive.glade:2220 olive.glade:2284
1258
1283
msgid "Revisions in branch: "
1286
#: olive.glade:2234 olive.glade:2298
1262
1287
msgid "<b>Branch history:</b>"
1290
#: olive.glade:2288 olive.glade:2352
1266
1291
msgid "Size of repository: "
1294
#: olive.glade:2300 olive.glade:2364
1270
1295
msgid "Revisions in repository: "
1298
#: olive.glade:2314 olive.glade:2378
1274
1299
msgid "<b>Revision store:</b>"
1302
#: olive.glade:2356 olive.glade:2421
1278
1303
msgid "Merge - Olive"
1306
#: olive.glade:2370 olive.glade:2435
1282
1307
msgid "Merge from:"
1310
#: olive.glade:2454 olive.glade:2522
1315
msgid "_Bookmark current directory"
1319
msgid "Show _ignored files"
1322
#: olive.glade:232 olive.glade:486
1327
msgid "kind changed"
1331
msgid "<b>Commit Message</b>"
1339
msgid "Commit all changes"
1343
msgid "Only commit selected changes"
1347
msgid "Commit all changes*"
1355
msgid "<i>* Cannot select specific files when merging</i>"
1359
msgid "Pending Revisions"
1363
msgid "Diff for whole tree"
1366
#: commit.py:518 commit.py:599
1367
msgid "File commit message"
1371
msgid "Global Commit Message"
1375
msgid "<b>Global Commit Message</b>"
1383
msgid "Commit message for "
1387
msgid "There are no changes in the working tree. Do you want to commit anyway?"
1390
#: branchview/treeview.py:400
1391
msgid "Please wait, loading ancestral graph..."
1394
#: olive/__init__.py:71
1395
msgid "Lead Developer:"
1398
#: olive/__init__.py:73
1399
msgid "Contributors:"
1402
#: olive/__init__.py:578
1404
msgid "%d local extra revision(s). \n"
1407
#: olive/__init__.py:590
1409
msgid "%d local missing revision(s).\n"
1412
#: olive/__init__.py:632
1413
msgid "Update successful but conflicts generated"
1416
#: olive/__init__.py:632
1418
msgid "Number of conflicts generated: %d."
1421
#: olive/__init__.py:634
1422
msgid "Update successful"
1425
#: olive/__init__.py:634
1426
msgid "No conflicts generated."