SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
This commit is contained in:
@@ -246,5 +246,25 @@ Action=Popup
|
|||||||
|
|
||||||
[Event/Share]
|
[Event/Share]
|
||||||
Name=Share
|
Name=Share
|
||||||
|
Name[ca]=Compartició
|
||||||
|
Name[eo]=Kundividi
|
||||||
|
Name[eu]=Partekatu
|
||||||
|
Name[ia]=Comparti
|
||||||
|
Name[ka]=გაზიარება
|
||||||
|
Name[nl]=Gedeelde
|
||||||
|
Name[sl]=Deli
|
||||||
|
Name[tr]=Paylaş
|
||||||
|
Name[uk]=Оприлюднення
|
||||||
|
Name[x-test]=xxSharexx
|
||||||
Comment=The result of sharing a piece of content
|
Comment=The result of sharing a piece of content
|
||||||
|
Comment[ca]=El resultat de compartir una peça de contingut
|
||||||
|
Comment[eo]=La rezulto el kundividado de enhavero
|
||||||
|
Comment[eu]=Eduki pieza bat partekatzearen emaitza
|
||||||
|
Comment[ia]=Le exito de compartir un pecietta de contento
|
||||||
|
Comment[ka]=შემცველობის ნაწილის გაზიარების შედეგი
|
||||||
|
Comment[nl]=Het resultaat van het delen van een stukje inhoud
|
||||||
|
Comment[sl]=Rezultat deljenega kosa vsebine
|
||||||
|
Comment[tr]=Bir parça içerik paylaşımının sonucu
|
||||||
|
Comment[uk]=Результат оприлюднення даних
|
||||||
|
Comment[x-test]=xxThe result of sharing a piece of contentxx
|
||||||
Action=Popup
|
Action=Popup
|
||||||
|
|||||||
Reference in New Issue
Block a user