1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
|
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2024-06-01 06:07+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#. type: TH
#: archlinux
#, no-wrap
msgid "PACDIFF"
msgstr ""
#. type: TH
#: archlinux
#, no-wrap
msgid "2024-05-10"
msgstr ""
#. type: TH
#: archlinux
#, no-wrap
msgid "Pacman-contrib 1\\&.10\\&.6"
msgstr ""
#. type: TH
#: archlinux
#, no-wrap
msgid "Pacman-contrib Manual"
msgstr ""
#. -----------------------------------------------------------------
#. * MAIN CONTENT STARTS HERE *
#. -----------------------------------------------------------------
#. type: SH
#: archlinux
#, no-wrap
msgid "NAME"
msgstr ""
#. type: Plain text
#: archlinux
msgid "pacdiff - pacorig, pacnew and pacsave maintenance utility"
msgstr ""
#. type: SH
#: archlinux
#, no-wrap
msgid "SYNOPSIS"
msgstr ""
#. type: Plain text
#: archlinux
msgid "I<pacdiff> [options]"
msgstr ""
#. type: SH
#: archlinux
#, no-wrap
msgid "DESCRIPTION"
msgstr ""
#. type: Plain text
#: archlinux
msgid ""
"I<pacdiff> is a script which looks for pacorig, pacnew and pacsave files "
"from the backup entries found in the local pacman db\\&. For every found "
"file the option is given to view, merge, skip, diff, remove or overwrite the "
"found pacorig, pacnew or pacsave file\\&."
msgstr ""
#. type: SH
#: archlinux
#, no-wrap
msgid "OPTIONS"
msgstr ""
#. type: SS
#: archlinux
#, no-wrap
msgid "Search Options"
msgstr ""
#. type: Plain text
#: archlinux
msgid "B<-f, --find>"
msgstr ""
#. type: Plain text
#: archlinux
msgid "Scan using find\\&."
msgstr ""
#. type: Plain text
#: archlinux
msgid "B<-l, --locate>"
msgstr ""
#. type: Plain text
#: archlinux
msgid "Scan using locate\\&."
msgstr ""
#. type: Plain text
#: archlinux
msgid "B<-p, --pacmandb>"
msgstr ""
#. type: Plain text
#: archlinux
msgid "Scan active config files from pacman database\\&. (default)"
msgstr ""
#. type: SS
#: archlinux
#, no-wrap
msgid "General Options"
msgstr ""
#. type: Plain text
#: archlinux
msgid "B<-b, --backup>"
msgstr ""
#. type: Plain text
#: archlinux
msgid "When overwriting, save old files with \\&.bak\\&."
msgstr ""
#. type: Plain text
#: archlinux
msgid "B<-c, --cachedir E<lt>dirE<gt>>"
msgstr ""
#. type: Plain text
#: archlinux
msgid ""
"Scan I<dir> instead as the pacman cache for 3-way merge base candidates\\&."
msgstr ""
#. type: Plain text
#: archlinux
msgid "B<-h, --help>"
msgstr ""
#. type: Plain text
#: archlinux
msgid "Display syntax and command-line options\\&."
msgstr ""
#. type: Plain text
#: archlinux
msgid "B<--nocolor>"
msgstr ""
#. type: Plain text
#: archlinux
msgid "Do not colorize output\\&."
msgstr ""
#. type: Plain text
#: archlinux
msgid "B<-o, --output>"
msgstr ""
#. type: Plain text
#: archlinux
msgid "Print files instead of merging them\\&."
msgstr ""
#. type: Plain text
#: archlinux
msgid "B<-s, --sudo>"
msgstr ""
#. type: Plain text
#: archlinux
msgid "Use sudo and sudoedit to merge/remove files\\&."
msgstr ""
#. type: Plain text
#: archlinux
msgid "B<-3, --threeway>"
msgstr ""
#. type: Plain text
#: archlinux
msgid ""
"View diffs in 3-way fashion if the base package is available in the "
"cache\\&. Fall back to regular 2-way diff otherwise\\&."
msgstr ""
#. type: Plain text
#: archlinux
msgid "B<-V, --version>"
msgstr ""
#. type: Plain text
#: archlinux
msgid "Display version information\\&."
msgstr ""
#. type: SH
#: archlinux
#, no-wrap
msgid "ENVIRONMENT"
msgstr ""
#. type: Plain text
#: archlinux
msgid "B<DIFFPROG>"
msgstr ""
#. type: Plain text
#: archlinux
msgid "Override the default I<vim -d> merge program\\&."
msgstr ""
#. type: Plain text
#: archlinux
msgid "B<DIFFSEARCHPATH>"
msgstr ""
#. type: Plain text
#: archlinux
msgid "Override the default search path I</etc>, only when using find\\&."
msgstr ""
#. type: Plain text
#: archlinux
msgid "B<MERGEPROG>"
msgstr ""
#. type: Plain text
#: archlinux
msgid ""
"Override the default I<diff3 -m> 3-way merge program\\&. One possible "
"alternative is I<git merge-file -p>\\&."
msgstr ""
#. type: SH
#: archlinux
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
#: archlinux
msgid "B<pacman>(8), B<pacman.conf>(5)"
msgstr ""
#. type: SH
#: archlinux
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
#: archlinux
msgid ""
"Bugs? You must be kidding; there are no bugs in this software\\&. But if we "
"happen to be wrong, file an issue with as much detail as possible at https://"
"gitlab\\&.archlinux\\&.org/pacman/pacman-contrib/-/issues/new\\&."
msgstr ""
#. type: SH
#: archlinux
#, no-wrap
msgid "AUTHORS"
msgstr ""
#. type: Plain text
#: archlinux
msgid "Current maintainers:"
msgstr ""
#. type: Plain text
#: archlinux
msgid "Johannes Löthberg E<lt>johannes@kyriasis\\&.comE<gt>"
msgstr ""
#. type: Plain text
#: archlinux
msgid "Daniel M\\&. Capella E<lt>polyzen@archlinux\\&.orgE<gt>"
msgstr ""
#. type: Plain text
#: archlinux
msgid ""
"For additional contributors, use git shortlog -s on the pacman-contrib\\&."
"git repository\\&."
msgstr ""
|
